merge trunk
authorK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 12:42:37 +0000 (21:42 +0900)
committerK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 12:42:37 +0000 (21:42 +0900)
commit1c12a6ee580a9dfd8fa6a27473ad4a237756d2e3
treeccc936d23590dcfddcf397f1ba13ebdeec9c0b30
parent156b3859dedfeffbc24ec72d5bb8a14d7a1e62c2
parent3ced2b0ab1d63965366c043fb474d6d79b231644
merge trunk